LoginDialog: clear previous auth failed messages when trying again

When the user has the entered the password for the second time
and clicked OK, clear messages from the previous attempt, so any
new failure is shown clearly.

https://bugzilla.gnome.org/show_bug.cgi?id=687132

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 42477322ecb443f835b609556eab3412a5f356e3..757d7de6fcc4c0435cf334b4062c063ed08c94a6 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -839,9 +839,13 @@ const LoginDialog = new Lang.Class({
     },
 
     _showMessage: function(userVerifier, message, styleClass) {
-        this._promptMessage.text = message;
-        this._promptMessage.styleClass = styleClass;
-        GdmUtil.fadeInActor(this._promptMessage);
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            GdmUtil.fadeInActor(this._promptMessage);
+        } else {
+            GdmUtil.fadeOutActor(this._promptMessage);
+        }
     },
 
     _showLoginHint: function(verifier, message) {

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 3615cf2f98d60404c9102a02f006911a901d8b1e..da31daab8d6826e1141148eaeaca17be72b88221 100644 (file)
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -125,6 +125,9 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     answerQuery: function(serviceName, answer) {
+        // Clear any previous message
+        this.emit('show-message', null, null);
+
         this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
     },
 

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index c86f13c11df25d27fb30ce1d81186c52d5042e47..b119783c1047013ad66a4b659c30ed944e686e51 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -208,9 +208,13 @@ const UnlockDialog = new Lang.Class({
     },
 
     _showMessage: function(userVerifier, message, styleClass) {
-        this._promptMessage.text = message;
-        this._promptMessage.styleClass = styleClass;
-        GdmUtil.fadeInActor(this._promptMessage);
+        if (message) {
+            this._promptMessage.text = message;
+            this._promptMessage.styleClass = styleClass;
+            GdmUtil.fadeInActor(this._promptMessage);
+        } else {
+            GdmUtil.fadeOutActor(this._promptMessage);
+        }
     },
 
     _onAskQuestion: function(verifier, serviceName, question, passwordChar) {